[issue2100] rebase failed if one of file is copied

[Max Tomilov]

New submission from Max Tomilov <max.tomilov at gmail.com>:

Ubuntu Karmic, Mercurial 1.5, Python 2.6.4

bullet at bullet-laptop:~/workshop/test/hg$ mkdir bug
bullet at bullet-laptop:~/workshop/test/hg$ cd bug
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg init .
bullet at bullet-laptop:~/workshop/test/hg/bug$ touch 1 2
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg add 1 2
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg ci -m "initial import"
1
2
committed changeset 0:c267aaf73db7
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg branch test_branch
marked working directory as branch test_branch
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg cp 1 3
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg ci -m "added 3"
3
committed changeset 1:cd463e8be06d
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg up default
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
bullet at bullet-laptop:~/workshop/test/hg/bug$ echo test >> 1
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg ci -m "default is changed"
1
created new head
committed changeset 2:f3267ed415c4
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg up test_branch
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
bullet at bullet-laptop:~/workshop/test/hg/bug$ hg glog
o  changeset:   2:f3267ed415c4
|  tag:         tip
|  parent:      0:c267aaf73db7
|  user:        Max Tomilov <mtomilov at altibase.com>
|  date:        Thu Mar 18 14:15:07 2010 +0900
|  summary:     default is changed
|
| @  changeset:   1:cd463e8be06d
|/   branch:      test_branch
|    user:        Max Tomilov <mtomilov at altibase.com>
|    date:        Thu Mar 18 14:14:50 2010 +0900
|    summary:     added 3
|
o  changeset:   0:c267aaf73db7
   user:        Max Tomilov <mtomilov at altibase.com>
   date:        Thu Mar 18 14:14:34 2010 +0900
   summary:     initial import

bullet at bullet-laptop:~/workshop/test/hg/bug$ hg parents
changeset:   1:cd463e8be06d
branch:      test_branch
user:        Max Tomilov <mtomilov at altibase.com>
date:        Thu Mar 18 14:14:50 2010 +0900
summary:     added 3

bullet at bullet-laptop:~/workshop/test/hg/bug$ hg rebase -d 2 --keepbranches -
-collapse
merging 1 and 3 to 3
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Mercurial Distributed SCM (version 1.5)
** Extensions loaded: graphlog, rebase, churn, transplant, patchbomb
Traceback (most recent call last):
  File "/usr/bin/hg", line 27, in <module>
    mercurial.dispatch.run()
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 30, in 
dispatch
    return _runcatch(u, args)
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 47, in 
_runcatch
    return _dispatch(ui, args)
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 466, in 
_dispatch
    return runcommand(lui, repo, cmd, fullargs, ui, options, d)
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 336, in 
runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 517, in 
_runcommand
    return checkargs()
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 471, in 
checkargs
    return cmdfunc()
  File "/usr/lib/pymodules/python2.6/mercurial/dispatch.py", line 465, in 
<lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File "/usr/lib/pymodules/python2.6/mercurial/util.py", line 401, in check
    return func(*args, **kwargs)
  File "/usr/lib/pymodules/python2.6/hgext/rebase.py", line 162, in rebase
    extra=extrafn)
  File "/usr/lib/pymodules/python2.6/hgext/rebase.py", line 248, in 
concludenode
    date=repo[rev].date(), extra=extra)
  File "/usr/lib/pymodules/python2.6/mercurial/localrepo.py", line 822, in 
commit
    if (not force and not extra.get("close") and p2 == nullid
AttributeError: 'function' object has no attribute 'get'
bullet at bullet-laptop:~/workshop/test/hg/bug$

----------
messages: 12070
nosy: mtomilov
priority: urgent
status: unread
title: rebase failed if one of file is copied

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2100>
____________________________________________________