Show More
@@ -438,7 +438,7 b' class dirstate(object):' | |||
|
438 | 438 | def copies(self): |
|
439 | 439 | return self._map.copymap |
|
440 | 440 | |
|
441 | def _addpath(self, f, state, mode, size, mtime): | |
|
441 | def _addpath(self, f, state, mode, size=NONNORMAL, mtime=AMBIGUOUS_TIME): | |
|
442 | 442 | oldstate = self[f] |
|
443 | 443 | if state == b'a' or oldstate == b'r': |
|
444 | 444 | scmutil.checkfilename(f) |
@@ -509,7 +509,7 b' class dirstate(object):' | |||
|
509 | 509 | return |
|
510 | 510 | if entry[0] == b'm' or entry[0] == b'n' and entry[2] == FROM_P2: |
|
511 | 511 | return |
|
512 |
self._addpath(f, b'n', 0 |
|
|
512 | self._addpath(f, b'n', 0) | |
|
513 | 513 | self._map.copymap.pop(f, None) |
|
514 | 514 | |
|
515 | 515 | def otherparent(self, f): |
@@ -519,15 +519,15 b' class dirstate(object):' | |||
|
519 | 519 | raise error.Abort(msg) |
|
520 | 520 | if f in self and self[f] == b'n': |
|
521 | 521 | # merge-like |
|
522 |
self._addpath(f, b'm', 0, FROM_P2 |
|
|
522 | self._addpath(f, b'm', 0, FROM_P2) | |
|
523 | 523 | else: |
|
524 | 524 | # add-like |
|
525 |
self._addpath(f, b'n', 0, FROM_P2 |
|
|
525 | self._addpath(f, b'n', 0, FROM_P2) | |
|
526 | 526 | self._map.copymap.pop(f, None) |
|
527 | 527 | |
|
528 | 528 | def add(self, f): |
|
529 | 529 | '''Mark a file added.''' |
|
530 |
self._addpath(f, b'a', 0 |
|
|
530 | self._addpath(f, b'a', 0) | |
|
531 | 531 | self._map.copymap.pop(f, None) |
|
532 | 532 | |
|
533 | 533 | def remove(self, f): |
General Comments 0
You need to be logged in to leave comments.
Login now