Show More
@@ -452,7 +452,7 b' class workingctx(changectx):' | |||||
452 | changes - a list of file lists as returned by localrepo.status() |
|
452 | changes - a list of file lists as returned by localrepo.status() | |
453 | or None to use the repository status. |
|
453 | or None to use the repository status. | |
454 | """ |
|
454 | """ | |
455 |
def __init__(self, repo, parents=None, text="", user=None, date=None, |
|
455 | def __init__(self, repo, parents=None, text="", user=None, date=None, | |
456 | extra=None, changes=None): |
|
456 | extra=None, changes=None): | |
457 | self._repo = repo |
|
457 | self._repo = repo | |
458 | self._rev = None |
|
458 | self._rev = None | |
@@ -688,7 +688,7 b' class memctx(object):' | |||||
688 | user - username string, or None. |
|
688 | user - username string, or None. | |
689 | extra - a dictionary of extra values, or None. |
|
689 | extra - a dictionary of extra values, or None. | |
690 | """ |
|
690 | """ | |
691 |
def __init__(self, repo, parents, text, files, filectxfn, user=None, |
|
691 | def __init__(self, repo, parents, text, files, filectxfn, user=None, | |
692 | date=None, extra=None): |
|
692 | date=None, extra=None): | |
693 | self._repo = repo |
|
693 | self._repo = repo | |
694 | self._rev = None |
|
694 | self._rev = None |
@@ -791,9 +791,9 b' class localrepository(repo.repository):' | |||||
791 | update_dirstate = (self.dirstate.parents()[0] == p1) |
|
791 | update_dirstate = (self.dirstate.parents()[0] == p1) | |
792 | changes = [files, [], [], [], []] |
|
792 | changes = [files, [], [], [], []] | |
793 |
|
793 | |||
794 |
wctx = context.workingctx(self, (p1, p2), text, user, date, |
|
794 | wctx = context.workingctx(self, (p1, p2), text, user, date, | |
795 | extra, changes) |
|
795 | extra, changes) | |
796 |
return self._commitctx(wctx, force, force_editor, empty_ok, |
|
796 | return self._commitctx(wctx, force, force_editor, empty_ok, | |
797 | use_dirstate, update_dirstate) |
|
797 | use_dirstate, update_dirstate) | |
798 | finally: |
|
798 | finally: | |
799 | del lock, wlock |
|
799 | del lock, wlock | |
@@ -803,8 +803,8 b' class localrepository(repo.repository):' | |||||
803 | try: |
|
803 | try: | |
804 | wlock = self.wlock() |
|
804 | wlock = self.wlock() | |
805 | lock = self.lock() |
|
805 | lock = self.lock() | |
806 |
return self._commitctx(ctx, force=True, force_editor=False, |
|
806 | return self._commitctx(ctx, force=True, force_editor=False, | |
807 |
empty_ok=True, use_dirstate=False, |
|
807 | empty_ok=True, use_dirstate=False, | |
808 | update_dirstate=False) |
|
808 | update_dirstate=False) | |
809 | finally: |
|
809 | finally: | |
810 | del lock, wlock |
|
810 | del lock, wlock |
General Comments 0
You need to be logged in to leave comments.
Login now