Mercurial > hg
changeset 6210:942287cb1f57
Removed trailing spaces from everything except test output
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 07 Mar 2008 00:24:36 +0100 |
| parents | 4e8cd15240bf |
| children | f89fd07fc51d |
| files | contrib/hgk doc/hgrc.5.txt hgext/convert/convcmd.py hgext/convert/hg.py hgext/convert/subversion.py hgext/record.py hgext/win32mbcs.py mercurial/commands.py mercurial/context.py mercurial/hgweb/hgwebdir_mod.py mercurial/localrepo.py templates/gitweb/footer.tmpl tests/test-convert-svn-sink tests/test-hgweb-commands.out tests/test-issue660 tests/test-qrecord tests/test-win32text |
| diffstat | 17 files changed, 34 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/hgk Fri Mar 07 00:01:13 2008 +0100 +++ b/contrib/hgk Fri Mar 07 00:24:36 2008 +0100 @@ -342,7 +342,7 @@ 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
--- a/doc/hgrc.5.txt Fri Mar 07 00:01:13 2008 +0100 +++ b/doc/hgrc.5.txt Fri Mar 07 00:24:36 2008 +0100 @@ -217,7 +217,7 @@ 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:
--- a/hgext/convert/convcmd.py Fri Mar 07 00:01:13 2008 +0100 +++ b/hgext/convert/convcmd.py Fri Mar 07 00:24:36 2008 +0100 @@ -236,7 +236,7 @@ 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:
--- a/hgext/convert/hg.py Fri Mar 07 00:01:13 2008 +0100 +++ b/hgext/convert/hg.py Fri Mar 07 00:24:36 2008 +0100 @@ -114,7 +114,7 @@ self.repo.lookup(b[0]) except: missings.setdefault(b[1], []).append(b[0]) - + if missings: self.after() for pbranch, heads in missings.iteritems():
--- a/hgext/convert/subversion.py Fri Mar 07 00:01:13 2008 +0100 +++ b/hgext/convert/subversion.py Fri Mar 07 00:24:36 2008 +0100 @@ -202,7 +202,7 @@ 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 @@ 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 @@ 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 @@ '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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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 @@ 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
--- a/hgext/record.py Fri Mar 07 00:01:13 2008 +0100 +++ b/hgext/record.py Fri Mar 07 00:24:36 2008 +0100 @@ -67,8 +67,8 @@ 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 @@ class hunk(object): """patch hunk - + XXX shouldn't we merge this with patch.hunk ? """ maxcontext = 3 @@ -267,7 +267,7 @@ 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)
--- a/hgext/win32mbcs.py Fri Mar 07 00:01:13 2008 +0100 +++ b/hgext/win32mbcs.py Fri Mar 07 00:24:36 2008 +0100 @@ -81,7 +81,7 @@ return arg def wrap(func): - + def wrapped(*args): # check argument is unicode, then call original for arg in args: @@ -122,7 +122,7 @@ 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 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)
--- a/mercurial/commands.py Fri Mar 07 00:01:13 2008 +0100 +++ b/mercurial/commands.py Fri Mar 07 00:24:36 2008 +0100 @@ -2474,7 +2474,7 @@ 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):
--- a/mercurial/context.py Fri Mar 07 00:01:13 2008 +0100 +++ b/mercurial/context.py Fri Mar 07 00:24:36 2008 +0100 @@ -232,7 +232,7 @@ 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)
--- a/mercurial/hgweb/hgwebdir_mod.py Fri Mar 07 00:01:13 2008 +0100 +++ b/mercurial/hgweb/hgwebdir_mod.py Fri Mar 07 00:24:36 2008 +0100 @@ -97,7 +97,7 @@ return # nested indexes and hgwebs - + repos = dict(self.repos) while virtual: real = repos.get(virtual)
--- a/mercurial/localrepo.py Fri Mar 07 00:01:13 2008 +0100 +++ b/mercurial/localrepo.py Fri Mar 07 00:24:36 2008 +0100 @@ -517,7 +517,7 @@ 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 @@ 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
--- a/templates/gitweb/footer.tmpl Fri Mar 07 00:01:13 2008 +0100 +++ b/templates/gitweb/footer.tmpl Fri Mar 07 00:24:36 2008 +0100 @@ -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#
--- a/tests/test-convert-svn-sink Fri Mar 07 00:01:13 2008 +0100 +++ b/tests/test-convert-svn-sink Fri Mar 07 00:24:36 2008 +0100 @@ -10,7 +10,7 @@ svnupanddisplay() { ( - cd $1; + cd $1; svn up; svn st -v | fixpath limit='' @@ -18,7 +18,7 @@ limit="--limit=$2" fi svn log --xml -v $limit | fixpath | sed 's,<date>.*,<date/>,' - ) + ) } echo "[extensions]" >> $HGRCPATH
--- a/tests/test-issue660 Fri Mar 07 00:01:13 2008 +0100 +++ b/tests/test-issue660 Fri Mar 07 00:24:36 2008 +0100 @@ -16,7 +16,7 @@ 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
--- a/tests/test-qrecord Fri Mar 07 00:01:13 2008 +0100 +++ b/tests/test-qrecord Fri Mar 07 00:24:36 2008 +0100 @@ -49,7 +49,7 @@ 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