equal
deleted
inserted
replaced
913 self.renamedelete = {} if renamedelete is None else renamedelete |
913 self.renamedelete = {} if renamedelete is None else renamedelete |
914 self.dirmove = {} if dirmove is None else dirmove |
914 self.dirmove = {} if dirmove is None else dirmove |
915 self.movewithdir = {} if movewithdir is None else movewithdir |
915 self.movewithdir = {} if movewithdir is None else movewithdir |
916 |
916 |
917 def __repr__(self): |
917 def __repr__(self): |
918 return '<branch_copies\n copy=%r\n renamedelete=%r\n dirmove=%r\n movewithdir=%r\n>' % ( |
918 return ( |
919 self.copy, |
919 '<branch_copies\n copy=%r\n renamedelete=%r\n dirmove=%r\n movewithdir=%r\n>' |
920 self.renamedelete, |
920 % ( |
921 self.dirmove, |
921 self.copy, |
922 self.movewithdir, |
922 self.renamedelete, |
|
923 self.dirmove, |
|
924 self.movewithdir, |
|
925 ) |
923 ) |
926 ) |
924 |
927 |
925 |
928 |
926 def _fullcopytracing(repo, c1, c2, base): |
929 def _fullcopytracing(repo, c1, c2, base): |
927 """The full copytracing algorithm which finds all the new files that were |
930 """The full copytracing algorithm which finds all the new files that were |