Rev 2601: (John Arbash Meinel) Simple fix to avoid a .split('/') when we don't need it in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2601
revision-id: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
parent: pqm at pqm.ubuntu.com-20070711055149-s5wsfnc1jatpoi1x
parent: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-11 17:28:42 +0100
message:
  (John Arbash Meinel) Simple fix to avoid a .split('/') when we don't need it
modified:
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2598.2.1
    merged: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
    parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: simple_no_split
    timestamp: Tue 2007-07-10 15:07:33 -0500
    message:
      Update WT4._iter_changes to not split the basename, since it will
      never contain a '/' character.
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-06-06 06:11:58 +0000
+++ b/bzrlib/workingtree_4.py	2007-07-10 20:07:33 +0000
@@ -2265,7 +2265,10 @@
                         # the file on disk is not present at all in the
                         # dirblock. Either way, report about the dirblock
                         # entry, and let other code handle the filesystem one.
-                        if current_path_info[1].split('/') < current_entry[0][1].split('/'):
+
+                        # Compare the basename for these files to determine
+                        # which comes first
+                        if current_path_info[1] < current_entry[0][1]:
                             # extra file on disk: pass for now, but only
                             # increment the path, not the entry
                             advance_entry = False