Mercurial > hg
changeset 7871:cdbe19abd1c5
merge with crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Mon, 23 Mar 2009 13:12:44 +0100 |
| parents | b2c18c795622 (current diff) bc027d72c289 (diff) |
| children | f680a1bd679b |
| files | |
| diffstat | 4 files changed, 13 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/mergetools.hgrc Fri Mar 20 18:55:20 2009 -0500 +++ b/contrib/mergetools.hgrc Mon Mar 23 13:12:44 2009 +0100 @@ -51,7 +51,7 @@ filemerge.args=-left $other -right $local -ancestor $base -merge $output filemerge.gui=True -beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centerfile=base /righttitle=other /automerge /reviewconflicts /solo +beyondcompare3.args=$local $other $base $output /ro /lefttitle=local /centertitle=base /righttitle=other /automerge /reviewconflicts /solo beyondcompare3.regkey=Software\Scooter Software\Beyond Compare 3 beyondcompare3.regname=ExePath beyondcompare3.gui=True
--- a/hgext/convert/p4.py Fri Mar 20 18:55:20 2009 -0500 +++ b/hgext/convert/p4.py Mon Mar 23 13:12:44 2009 +0100 @@ -66,7 +66,7 @@ else: cmd = "p4 -G client -o '%s'" % path clientspec = marshal.load(util.popen(cmd)) - + views = {} for client in clientspec: if client.startswith("View"): @@ -89,8 +89,8 @@ # handle revision limiting startrev = self.ui.config('convert', 'p4.startrev', default=0) - self.p4changes = [x for x in self.p4changes - if ((not startrev or int(x) >= int(startrev)) and + self.p4changes = [x for x in self.p4changes + if ((not startrev or int(x) >= int(startrev)) and (not self.rev or int(x) <= int(self.rev)))] # now read the full changelists to get the list of file revisions @@ -110,7 +110,7 @@ parents = [lastid] else: parents = [] - + date = (int(d["time"]), 0) # timezone not set c = commit(author=self.recode(d["user"]), date=util.datestr(date), parents=parents, desc=desc, branch='', extra={"p4": change}) @@ -131,7 +131,7 @@ self.changeset[change] = c self.files[change] = files lastid = change - + if lastid: self.heads = [lastid]
--- a/mercurial/keepalive.py Fri Mar 20 18:55:20 2009 -0500 +++ b/mercurial/keepalive.py Mon Mar 23 13:12:44 2009 +0100 @@ -408,7 +408,7 @@ # close the connection as protocol synchronisation is # probably lost self.close() - raise IncompleteRead(value) + raise httplib.IncompleteRead(value) if chunk_left == 0: break if amt is None:
--- a/mercurial/util.py Fri Mar 20 18:55:20 2009 -0500 +++ b/mercurial/util.py Mon Mar 23 13:12:44 2009 +0100 @@ -1273,14 +1273,14 @@ def find_exe(command): '''Find executable for command searching like cmd.exe does. If command is a basename then PATH is searched for command. - PATH isn't searched if command is an absolute or relative path. + PATH isn't searched if command is an absolute or relative path. An extension from PATHEXT is found and added if not present. If command isn't found None is returned.''' pathext = os.environ.get('PATHEXT', '.COM;.EXE;.BAT;.CMD') pathexts = [ext for ext in pathext.lower().split(os.pathsep)] if os.path.splitext(command)[1].lower() in pathexts: pathexts = [''] - + def findexisting(pathcommand): 'Will append extension (if needed) and return existing file' for ext in pathexts: @@ -1291,7 +1291,7 @@ if os.sep in command: return findexisting(command) - + for path in os.environ.get('PATH', '').split(os.pathsep): executable = findexisting(os.path.join(path, command)) if executable is not None: @@ -1465,11 +1465,11 @@ def find_exe(command): '''Find executable for command searching like which does. If command is a basename then PATH is searched for command. - PATH isn't searched if command is an absolute or relative path. + PATH isn't searched if command is an absolute or relative path. If command isn't found None is returned.''' if sys.platform == 'OpenVMS': return command - + def findexisting(executable): 'Will return executable if existing file' if os.path.exists(executable): @@ -1478,7 +1478,7 @@ if os.sep in command: return findexisting(command) - + for path in os.environ.get('PATH', '').split(os.pathsep): executable = findexisting(os.path.join(path, command)) if executable is not None: