facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

Removed trailing spaces from everything except test output

Browse Source
This commit is contained in:
Thomas Arendsen Hein 2008-03-07 00:24:36 +01:00
parent 9ff01ae3fe
commit deb94bc7fe
17 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/hgk
View File

@ -342,7 +342,7 @@ proc parsecommit {id contents listed olds} {
proc readrefs {} {
global tagids idtags headids idheads tagcontents env curid
set curid [exec $env(HG) --config ui.report_untrusted=false id]
regexp -- {[[:xdigit:]]+} $curid curid

2
doc/hgrc.5.txt
View File

@ -217,7 +217,7 @@ extensions::
defines the extension.
To explicitly disable an extension that is enabled in an hgrc of
broader scope, prepend its path with '!', as in
broader scope, prepend its path with '!', as in
'hgext.foo = !/ext/path' or 'hgext.foo = !' when no path is supplied.
Example for ~/.hgrc:

2
hgext/convert/convcmd.py
View File

@ -236,7 +236,7 @@ class converter(object):
for prev in commit.parents:
if prev not in self.commitcache:
self.cachecommit(prev)
pbranches.append((self.map[prev],
pbranches.append((self.map[prev],
self.commitcache[prev].branch))
self.dest.setbranch(commit.branch, pbranches)
for f, v in files:

2
hgext/convert/hg.py
View File

@ -114,7 +114,7 @@ class mercurial_sink(converter_sink):
self.repo.lookup(b[0])
except:
missings.setdefault(b[1], []).append(b[0])
if missings:
self.after()
for pbranch, heads in missings.iteritems():

24
hgext/convert/subversion.py
View File

@ -202,7 +202,7 @@ class svn_source(converter_source):
if self.startrev < 0:
self.startrev = 0
except ValueError:
raise util.Abort(_('svn: start revision %s is not an integer')
raise util.Abort(_('svn: start revision %s is not an integer')
% self.startrev)
try:
@ -215,7 +215,7 @@ class svn_source(converter_source):
raise util.Abort(_('no revision found in module %s') %
self.module.encode(self.encoding))
self.last_changed = self.revnum(self.head)
self._changescache = None
if os.path.exists(os.path.join(url, '.svn/entries')):
@ -288,7 +288,7 @@ class svn_source(converter_source):
self.ui.note(_('ignoring empty branch %s\n') %
branch.encode(self.encoding))
continue
self.ui.note('found branch %s at %d\n' %
self.ui.note('found branch %s at %d\n' %
(branch, self.revnum(brevid)))
self.heads.append(brevid)
@ -298,7 +298,7 @@ class svn_source(converter_source):
'with more than one branch'))
revnum = self.revnum(self.heads[0])
if revnum < self.startrev:
raise util.Abort(_('svn: no revision found after start revision %d')
raise util.Abort(_('svn: no revision found after start revision %d')
% self.startrev)
return self.heads
@ -322,9 +322,9 @@ class svn_source(converter_source):
else:
# Perform a full checkout on roots
uuid, module, revnum = self.revsplit(rev)
entries = svn.client.ls(self.base + module, optrev(revnum),
entries = svn.client.ls(self.base + module, optrev(revnum),
True, self.ctx)
files = [n for n,e in entries.iteritems()
files = [n for n,e in entries.iteritems()
if e.kind == svn.core.svn_node_file]
copies = {}
@ -364,7 +364,7 @@ class svn_source(converter_source):
tags = {}
if self.tags is None:
return tags
start = self.revnum(self.head)
try:
for entry in get_log(self.url, [self.tags], self.startrev, start):
@ -442,7 +442,7 @@ class svn_source(converter_source):
if not path.startswith(p) or not paths[p].copyfrom_path:
continue
newpath = paths[p].copyfrom_path + path[len(p):]
self.ui.debug("branch renamed from %s to %s at %d\n" %
self.ui.debug("branch renamed from %s to %s at %d\n" %
(path, newpath, revnum))
path = newpath
break
@ -566,7 +566,7 @@ class svn_source(converter_source):
self.reparent('')
fromkind = svn.ra.check_path(self.ra, entrypath.strip('/'), fromrev)
self.reparent(self.module)
if fromkind == svn.core.svn_node_file: # a deleted file
entries.append(self.recode(entry))
elif fromkind == svn.core.svn_node_dir:
@ -677,7 +677,7 @@ class svn_source(converter_source):
self.child_cset = None
def parselogentry(orig_paths, revnum, author, date, message):
"""Return the parsed commit object or None, and True if
"""Return the parsed commit object or None, and True if
the revision is a branch root.
"""
self.ui.debug("parsing revision %d (%d changes)\n" %
@ -764,13 +764,13 @@ class svn_source(converter_source):
lastonbranch = True
break
if self.is_blacklisted(revnum):
self.ui.note('skipping blacklisted revision %d\n'
self.ui.note('skipping blacklisted revision %d\n'
% revnum)
continue
if paths is None:
self.ui.debug('revision %d has no entries\n' % revnum)
continue
cset, lastonbranch = parselogentry(paths, revnum, author,
cset, lastonbranch = parselogentry(paths, revnum, author,
date, message)
if cset:
firstcset = cset

8
hgext/record.py
View File

@ -67,8 +67,8 @@ def scanpatch(fp):
class header(object):
"""patch header
XXX shoudn't we move this to mercurial/patch.py ?
XXX shoudn't we move this to mercurial/patch.py ?
"""
diff_re = re.compile('diff --git a/(.*) b/(.*)$')
allhunks_re = re.compile('(?:index|new file|deleted file) ')
@ -134,7 +134,7 @@ def countchanges(hunk):
class hunk(object):
"""patch hunk
XXX shouldn't we merge this with patch.hunk ?
"""
maxcontext = 3
@ -267,7 +267,7 @@ def filterpatch(ui, chunks):
applied = {} # 'filename' -> [] of chunks
def prompt(query):
"""prompt query, and process base inputs
- y/n for the rest of file
- y/n for the rest
- ? (help)

6
hgext/win32mbcs.py
View File

@ -81,7 +81,7 @@ def encode_with_check(arg):
return arg
def wrap(func):
def wrapped(*args):
# check argument is unicode, then call original
for arg in args:
@ -122,7 +122,7 @@ def install():
from mercurial import ui
_ui = ui.ui()
os.path.join = wrap(os.path.join)
os.path.split = wrap(os.path.split)
os.path.split = wrap(os.path.split)
os.path.splitext = wrap(os.path.splitext)
os.path.splitunc = wrap(os.path.splitunc)
os.path.normpath = wrap(os.path.normpath)
@ -134,7 +134,7 @@ def install():
def uninstall():
# restore original functions.
os.path.join = unwrap(os.path.join)
os.path.split = unwrap(os.path.split)
os.path.split = unwrap(os.path.split)
os.path.splitext = unwrap(os.path.splitext)
os.path.splitunc = unwrap(os.path.splitunc)
os.path.normpath = unwrap(os.path.normpath)

2
mercurial/commands.py
View File

@ -2474,7 +2474,7 @@ def serve(ui, repo, **opts):
ui.status(_('listening at http://%s:%d/%s\n') %
(self.httpd.addr, self.httpd.port, prefix))
else:
ui.status(_('listening at http://%s/%s\n') %
ui.status(_('listening at http://%s/%s\n') %
(self.httpd.addr, prefix))
def run(self):

2
mercurial/context.py
View File

@ -232,7 +232,7 @@ class filectx(object):
if '_changectx' in self.__dict__:
return self._changectx.rev()
if '_changeid' in self.__dict__:
return self._changectx.rev()
return self._changectx.rev()
return self._filelog.linkrev(self._filenode)
def linkrev(self): return self._filelog.linkrev(self._filenode)

2
mercurial/hgweb/hgwebdir_mod.py
View File

@ -97,7 +97,7 @@ class hgwebdir(object):
return
# nested indexes and hgwebs
repos = dict(self.repos)
while virtual:
real = repos.get(virtual)

4
mercurial/localrepo.py
View File

@ -517,7 +517,7 @@ class localrepository(repo.repository):
fn = None
params = cmd
for name, filterfn in self._datafilters.iteritems():
if cmd.startswith(name):
if cmd.startswith(name):
fn = filterfn
params = cmd[len(name):].lstrip()
break
@ -1585,7 +1585,7 @@ class localrepository(repo.repository):
Another wrinkle is doing the reverse, figuring out which changeset in
the changegroup a particular filenode or manifestnode belongs to.
The caller can specify some nodes that must be included in the
changegroup using the extranodes argument. It should be a dict
where the keys are the filenames (or 1 for the manifest), and the

2
templates/gitweb/footer.tmpl
View File

@ -1,6 +1,6 @@
<div class="page_footer">
<div class="page_footer_text">#repo|escape#</div>
<a class="rss_logo" href="#url#rss-log">RSS</a>
<a class="rss_logo" href="#url#rss-log">RSS</a>
<a class="rss_logo" href="#url#atom-log">Atom</a>
<br />
#motd#

4
tests/test-convert-svn-sink
View File

@ -10,7 +10,7 @@ fixpath()
svnupanddisplay()
{
(
cd $1;
cd $1;
svn up;
svn st -v | fixpath
limit=''
@ -18,7 +18,7 @@ svnupanddisplay()
limit="--limit=$2"
fi
svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,'
)
)
}
echo "[extensions]" >> $HGRCPATH

2
tests/test-hgweb-commands.out
View File

@ -458,7 +458,7 @@ summary |
</table>
<div class="page_footer">
<div class="page_footer_text">test</div>
<a class="rss_logo" href="/rss-log">RSS</a>
<a class="rss_logo" href="/rss-log">RSS</a>
<a class="rss_logo" href="/atom-log">Atom</a>
<br />

2
tests/test-issue660
View File

@ -16,7 +16,7 @@ mkdir a
echo a > a/a
echo % should fail - would corrupt dirstate
hg add a/a
hg add a/a
echo % removing shadow
hg rm --after a

2
tests/test-qrecord
View File

@ -49,7 +49,7 @@ EOF
hg add 1.txt 2.txt dir/a.txt
hg commit -d '0 0' -m 'initial checkin'
echo % changing files
echo % changing files
sed -e 's/2/2 2/;s/4/4 4/' 1.txt > 1.txt.new
sed -e 's/b/b b/' 2.txt > 2.txt.new

2
tests/test-win32text
View File

@ -1,6 +1,6 @@
#!/bin/sh
cat > unix2dos.py <<EOF
cat > unix2dos.py <<EOF
import sys
for path in sys.argv[1:]: