##// END OF EJS Templates
remove trailing spaces
Dirkjan Ochtman -
r6553:0bb76d16 default
parent child Browse files
Show More
@@ -688,7 +688,7 b' class svn_source(converter_source):'
688 if not copyfrompath:
688 if not copyfrompath:
689 continue
689 continue
690 copyfrom[path] = ent
690 copyfrom[path] = ent
691 self.ui.debug("mark %s came from %s:%d\n"
691 self.ui.debug("mark %s came from %s:%d\n"
692 % (path, copyfrompath, ent.copyfrom_rev))
692 % (path, copyfrompath, ent.copyfrom_rev))
693 children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
693 children = self._find_children(ent.copyfrom_path, ent.copyfrom_rev)
694 children.sort()
694 children.sort()
@@ -738,7 +738,7 b' class svn_source(converter_source):'
738 if root_paths:
738 if root_paths:
739 path, ent = root_paths[-1]
739 path, ent = root_paths[-1]
740 if ent.copyfrom_path:
740 if ent.copyfrom_path:
741 # If dir was moved while one of its file was removed
741 # If dir was moved while one of its file was removed
742 # the log may look like:
742 # the log may look like:
743 # A /dir (from /dir:x)
743 # A /dir (from /dir:x)
744 # A /dir/a (from /dir/a:y)
744 # A /dir/a (from /dir/a:y)
@@ -746,7 +746,7 b' class svn_source(converter_source):'
746 # ...
746 # ...
747 # for all remaining children.
747 # for all remaining children.
748 # Let's take the highest child element from rev as source.
748 # Let's take the highest child element from rev as source.
749 copies = [(p,e) for p,e in orig_paths[:-1]
749 copies = [(p,e) for p,e in orig_paths[:-1]
750 if isdescendantof(ent.copyfrom_path, e.copyfrom_path)]
750 if isdescendantof(ent.copyfrom_path, e.copyfrom_path)]
751 fromrev = max([e.copyfrom_rev for p,e in copies] + [ent.copyfrom_rev])
751 fromrev = max([e.copyfrom_rev for p,e in copies] + [ent.copyfrom_rev])
752 branched = True
752 branched = True
@@ -1903,7 +1903,7 b' def savename(path):'
1903
1903
1904 def push(ui, repo, patch=None, **opts):
1904 def push(ui, repo, patch=None, **opts):
1905 """push the next patch onto the stack
1905 """push the next patch onto the stack
1906
1906
1907 When --force is applied, all local changes in patched files will be lost.
1907 When --force is applied, all local changes in patched files will be lost.
1908 """
1908 """
1909 q = repo.mq
1909 q = repo.mq
@@ -1025,7 +1025,7 b' def walkchangerevs(ui, repo, pats, chang'
1025 slowpath = True
1025 slowpath = True
1026 break
1026 break
1027 else:
1027 else:
1028 ui.warn(_('%s:%s copy source revision cannot be found!\n')
1028 ui.warn(_('%s:%s copy source revision cannot be found!\n')
1029 % (file_, short(node)))
1029 % (file_, short(node)))
1030 continue
1030 continue
1031 for rev, copied in filerevgen(filelog, node):
1031 for rev, copied in filerevgen(filelog, node):
General Comments 0
You need to be logged in to leave comments. Login now