Mercurial > hgsubversion

diff hg_delta_editor.py @ 119:ea65fe2b0856

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hg_delta_editor: fix update of stray files in branches/ Ensure that self.current_file is a non-empty path in a branch.
author Patrick Mezard <pmezard@gmail.com>
date Sat, 29 Nov 2008 11:25:01 -0600
parents 30580c05dccc
children f508c1fa19a5
line wrap: on
line diff
--- a/hg_delta_editor.py
+++ b/hg_delta_editor.py
@@ -489,7 +489,8 @@ class HgChangeReceiver(delta.Editor):
     @stash_exception_on_self
     def open_file(self, path, parent_baton, base_revision, p=None):
         self.current_file = 'foobaz'
-        if self._is_path_valid(path):
+        fpath, branch = self._path_and_branch_for_path(path)
+        if fpath:
             self.current_file = path
             self.ui.status('M %s\n' % path)
             if base_revision != -1:
@@ -529,8 +530,6 @@ class HgChangeReceiver(delta.Editor):
         self.base_revision = None
         if path in self.deleted_files:
             del self.deleted_files[path]
-        if not self._is_path_valid(path):
-            return
         fpath, branch = self._path_and_branch_for_path(path)
         if not fpath:
             return