##// END OF EJS Templates
kill trailing whitespace
Dirkjan Ochtman -
r8843:eb7b247a default
parent child Browse files
Show More
@@ -120,7 +120,7 b' def churn(ui, repo, *pats, **opts):'
120
120
121 It is possible to map alternate email addresses to a main address
121 It is possible to map alternate email addresses to a main address
122 by providing a file using the following format:
122 by providing a file using the following format:
123
123
124 <alias email> <actual email>
124 <alias email> <actual email>
125
125
126 Such a file may be specified with the --aliases option, otherwise a
126 Such a file may be specified with the --aliases option, otherwise a
@@ -80,7 +80,7 b' class converter(object):'
80 self.authorfile = None
80 self.authorfile = None
81
81
82 # Record converted revisions persistently: maps source revision
82 # Record converted revisions persistently: maps source revision
83 # ID to target revision ID (both strings). (This is how
83 # ID to target revision ID (both strings). (This is how
84 # incremental conversions work.)
84 # incremental conversions work.)
85 self.map = mapfile(ui, revmapfile)
85 self.map = mapfile(ui, revmapfile)
86
86
@@ -297,7 +297,7 b' class converter(object):'
297 parents = [self.map.get(p, p) for p in parents]
297 parents = [self.map.get(p, p) for p in parents]
298 except KeyError:
298 except KeyError:
299 parents = [b[0] for b in pbranches]
299 parents = [b[0] for b in pbranches]
300 newnode = self.dest.putcommit(files, copies, parents, commit,
300 newnode = self.dest.putcommit(files, copies, parents, commit,
301 self.source, self.map)
301 self.source, self.map)
302 self.source.converted(rev, newnode)
302 self.source.converted(rev, newnode)
303 self.map[rev] = newnode
303 self.map[rev] = newnode
@@ -159,7 +159,7 b' class p4_source(converter_source):'
159
159
160 if code == "error":
160 if code == "error":
161 raise IOError(d["generic"], data)
161 raise IOError(d["generic"], data)
162
162
163 elif code == "stat":
163 elif code == "stat":
164 p4type = self.re_type.match(d["type"])
164 p4type = self.re_type.match(d["type"])
165 if p4type:
165 if p4type:
@@ -173,7 +173,7 b' class p4_source(converter_source):'
173 keywords = self.re_keywords_old
173 keywords = self.re_keywords_old
174 elif "k" in flags:
174 elif "k" in flags:
175 keywords = self.re_keywords
175 keywords = self.re_keywords
176
176
177 elif code == "text" or code == "binary":
177 elif code == "text" or code == "binary":
178 contents += data
178 contents += data
179
179
@@ -472,7 +472,7 b' class svn_source(converter_source):'
472 # Here/tags/tag.1 discarded as well as its children.
472 # Here/tags/tag.1 discarded as well as its children.
473 # It happens with tools like cvs2svn. Such tags cannot
473 # It happens with tools like cvs2svn. Such tags cannot
474 # be represented in mercurial.
474 # be represented in mercurial.
475 addeds = dict((p, e.copyfrom_path) for p,e
475 addeds = dict((p, e.copyfrom_path) for p, e
476 in origpaths.iteritems() if e.action == 'A')
476 in origpaths.iteritems() if e.action == 'A')
477 badroots = set()
477 badroots = set()
478 for destroot in addeds:
478 for destroot in addeds:
@@ -484,7 +484,7 b' class svn_source(converter_source):'
484 break
484 break
485
485
486 for badroot in badroots:
486 for badroot in badroots:
487 pendings = [p for p in pendings if p[2] != badroot
487 pendings = [p for p in pendings if p[2] != badroot
488 and not p[2].startswith(badroot + '/')]
488 and not p[2].startswith(badroot + '/')]
489
489
490 # Tell tag renamings from tag creations
490 # Tell tag renamings from tag creations
@@ -497,7 +497,7 b' class svn_source(converter_source):'
497 if tagname in tags:
497 if tagname in tags:
498 # Keep the latest tag value
498 # Keep the latest tag value
499 continue
499 continue
500 # From revision may be fake, get one with changes
500 # From revision may be fake, get one with changes
501 try:
501 try:
502 tagid = self.latest(source, sourcerev)
502 tagid = self.latest(source, sourcerev)
503 if tagid and tagname not in tags:
503 if tagid and tagname not in tags:
@@ -224,7 +224,6 b' def addaliases(ui, cmdtable):'
224 # but only if they have been defined prior to the current definition.
224 # but only if they have been defined prior to the current definition.
225 for alias, definition in ui.configitems('alias'):
225 for alias, definition in ui.configitems('alias'):
226 aliasdef = cmdalias(alias, definition, cmdtable)
226 aliasdef = cmdalias(alias, definition, cmdtable)
227
228 cmdtable[alias] = (aliasdef, aliasdef.opts, aliasdef.help)
227 cmdtable[alias] = (aliasdef, aliasdef.opts, aliasdef.help)
229 if aliasdef.norepo:
228 if aliasdef.norepo:
230 commands.norepo += ' %s' % alias
229 commands.norepo += ' %s' % alias
@@ -972,7 +972,7 b' def iterhunks(ui, fp, sourcefile=None, t'
972 def applydiff(ui, fp, changed, strip=1, sourcefile=None, reverse=False,
972 def applydiff(ui, fp, changed, strip=1, sourcefile=None, reverse=False,
973 eol=None):
973 eol=None):
974 """
974 """
975 Reads a patch from fp and tries to apply it.
975 Reads a patch from fp and tries to apply it.
976
976
977 The dict 'changed' is filled in with all of the filenames changed
977 The dict 'changed' is filled in with all of the filenames changed
978 by the patch. Returns 0 for a clean patch, -1 if any rejects were
978 by the patch. Returns 0 for a clean patch, -1 if any rejects were
@@ -1137,7 +1137,7 b' def internalpatch(patchobj, ui, strip, c'
1137 eol = {'strict': None, 'crlf': '\r\n', 'lf': '\n'}[eolmode.lower()]
1137 eol = {'strict': None, 'crlf': '\r\n', 'lf': '\n'}[eolmode.lower()]
1138 except KeyError:
1138 except KeyError:
1139 raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
1139 raise util.Abort(_('Unsupported line endings type: %s') % eolmode)
1140
1140
1141 try:
1141 try:
1142 fp = file(patchobj, 'rb')
1142 fp = file(patchobj, 'rb')
1143 except TypeError:
1143 except TypeError:
@@ -16,7 +16,7 b''
16 # If you change this script, it is recommended that you ensure you
16 # If you change this script, it is recommended that you ensure you
17 # haven't broken it by running it in various modes with a representative
17 # haven't broken it by running it in various modes with a representative
18 # sample of test scripts. For example:
18 # sample of test scripts. For example:
19 #
19 #
20 # 1) serial, no coverage, temp install:
20 # 1) serial, no coverage, temp install:
21 # ./run-tests.py test-s*
21 # ./run-tests.py test-s*
22 # 2) serial, no coverage, local hg:
22 # 2) serial, no coverage, local hg:
General Comments 0
You need to be logged in to leave comments. Login now