# HG changeset patch # User Thomas Arendsen Hein # Date 2008-03-06 23:24:36 # Node ID 942287cb1f579e36f1b5a8002224116e3439ca3f # Parent 4e8cd15240bf8d8f179cc4e7ebe25cb4d94644e1 Removed trailing spaces from everything except test output diff --git a/contrib/hgk b/contrib/hgk --- a/contrib/hgk +++ b/contrib/hgk @@ -342,7 +342,7 @@ proc parsecommit {id contents listed old 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 diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -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: diff --git a/hgext/convert/convcmd.py b/hgext/convert/convcmd.py --- a/hgext/convert/convcmd.py +++ b/hgext/convert/convcmd.py @@ -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: diff --git a/hgext/convert/hg.py b/hgext/convert/hg.py --- a/hgext/convert/hg.py +++ b/hgext/convert/hg.py @@ -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(): diff --git a/hgext/convert/subversion.py b/hgext/convert/subversion.py --- a/hgext/convert/subversion.py +++ b/hgext/convert/subversion.py @@ -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 diff --git a/hgext/record.py b/hgext/record.py --- a/hgext/record.py +++ b/hgext/record.py @@ -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) diff --git a/hgext/win32mbcs.py b/hgext/win32mbcs.py --- a/hgext/win32mbcs.py +++ b/hgext/win32mbcs.py @@ -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) diff --git a/mercurial/commands.py b/mercurial/commands.py --- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -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): diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -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) diff --git a/mercurial/hgweb/hgwebdir_mod.py b/mercurial/hgweb/hgwebdir_mod.py --- a/mercurial/hgweb/hgwebdir_mod.py +++ b/mercurial/hgweb/hgwebdir_mod.py @@ -97,7 +97,7 @@ class hgwebdir(object): return # nested indexes and hgwebs - + repos = dict(self.repos) while virtual: real = repos.get(virtual) diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -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 diff --git a/templates/gitweb/footer.tmpl b/templates/gitweb/footer.tmpl --- a/templates/gitweb/footer.tmpl +++ b/templates/gitweb/footer.tmpl @@ -1,6 +1,6 @@
#repo|escape#
- +
#motd# diff --git a/tests/test-convert-svn-sink b/tests/test-convert-svn-sink --- a/tests/test-convert-svn-sink +++ b/tests/test-convert-svn-sink @@ -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,.*,,' - ) + ) } echo "[extensions]" >> $HGRCPATH diff --git a/tests/test-hgweb-commands.out b/tests/test-hgweb-commands.out index aba5325d352c48ac0e2aa91841da937b1afd4566..ca2c89c4617605e944d1293a34856a0ba9beca33 GIT binary patch literal 17350 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 O{r1(}&6}I+&i?_uzwK}U diff --git a/tests/test-issue660 b/tests/test-issue660 --- a/tests/test-issue660 +++ b/tests/test-issue660 @@ -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 diff --git a/tests/test-qrecord b/tests/test-qrecord --- a/tests/test-qrecord +++ b/tests/test-qrecord @@ -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 diff --git a/tests/test-win32text b/tests/test-win32text --- a/tests/test-win32text +++ b/tests/test-win32text @@ -1,6 +1,6 @@ #!/bin/sh -cat > unix2dos.py < unix2dos.py <