657         else:

   657         else:

   658             p1, p2 = parents

   658             p1, p2 = parents

   659 

   659 

   660         n = None

   660         n = None

   661         if update:

   661         if update:

   662             if p1 != parents[0]:

   663             if p1 != parents[0]:

   663                 updatefunc(repo, p1.node())

   664                 updatefunc(repo, p1.node())

   664             if p2 != parents[1]:

   665             if p2 != parents[1]:

   665                 repo.setparents(p1.node(), p2.node())

   666                 repo.setparents(p1.node(), p2.node())

   666 

   667 

   696                 else:

   697                 else:

   697                     editor = getcommiteditor(editform=editform, **opts)

   698                     editor = getcommiteditor(editform=editform, **opts)

   698                 n = repo.commit(message, opts.get('user') or user,

   699                 n = repo.commit(message, opts.get('user') or user,

   699                                 opts.get('date') or date, match=m,

   700                                 opts.get('date') or date, match=m,

   700                                 editor=editor, force=partial)

   701                                 editor=editor, force=partial)

   701         else:

   703         else:

   702             if opts.get('exact') or opts.get('import_branch'):

   704             if opts.get('exact') or opts.get('import_branch'):

   703                 branch = branch or 'default'

   705                 branch = branch or 'default'

   704             else:

   706             else:

   705                 branch = p1.branch()

   707                 branch = p1.branch()