hgext/transplant.py
changeset 4680 059bdc8dfb9d
parent 4635 63b9d2deed48
child 4915 97b734fb9c6f
equal deleted inserted replaced
4679:826659bd8053 4680:059bdc8dfb9d
    94         p1, p2 = repo.dirstate.parents()
    94         p1, p2 = repo.dirstate.parents()
    95         pulls = []
    95         pulls = []
    96         diffopts = patch.diffopts(self.ui, opts)
    96         diffopts = patch.diffopts(self.ui, opts)
    97         diffopts.git = True
    97         diffopts.git = True
    98 
    98 
       
    99         wlock = repo.wlock()
    99         lock = repo.lock()
   100         lock = repo.lock()
   100         wlock = repo.wlock()
       
   101         try:
   101         try:
   102             for rev in revs:
   102             for rev in revs:
   103                 node = revmap[rev]
   103                 node = revmap[rev]
   104                 revstr = '%s:%s' % (rev, revlog.short(node))
   104                 revstr = '%s:%s' % (rev, revlog.short(node))
   105 
   105