Mercurial > hg
changeset 7869:bc027d72c289
cleanup: remove all trailing whitespace
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Mon, 23 Mar 2009 13:11:11 +0100 |
parents | 2b901f9b37aa |
children | 7bcce39e8f07 cdbe19abd1c5 f62482848d1b |
files | hgext/convert/p4.py mercurial/util.py |
diffstat | 2 files changed, 11 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/p4.py Mon Mar 23 11:12:01 2009 +0100 +++ b/hgext/convert/p4.py Mon Mar 23 13:11:11 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/util.py Mon Mar 23 11:12:01 2009 +0100 +++ b/mercurial/util.py Mon Mar 23 13:11:11 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: