branch: operate on branch names in local string space where possible
Previously, branch names were ideally manipulated as UTF-8 strings,
because they were stored as UTF-8 in the dirstate and the changelog
and could not be safely converted to the local encoding and back.
However, only about 80% of branch name code was actually using the
right encoding conventions. This patch uses the localstr addition to
allow working on branch names as local strings, which simplifies
handling so that the previously incorrect code becomes correct.
$ cat >> $HGRCPATH <<EOF
> [extensions]
> graphlog=
> rebase=
>
> [alias]
> tlog = log --template "{rev}: '{desc}' {branches}\n"
> tglog = tlog --graph
> EOF
$ hg init a
$ cd a
$ echo a > a
$ hg ci -Am A
adding a
$ echo b > b
$ hg ci -Am B
adding b
$ hg up -q -C 0
$ hg mv a a-renamed
$ hg ci -m 'rename A'
created new head
$ hg tglog
@ 2: 'rename A'
|
| o 1: 'B'
|/
o 0: 'A'
Rename is tracked:
$ hg tlog -p --git -r tip
2: 'rename A'
diff --git a/a b/a-renamed
rename from a
rename to a-renamed
Rebase the revision containing the rename:
$ hg rebase -s 2 -d 1
saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 2: 'rename A'
|
o 1: 'B'
|
o 0: 'A'
Rename is not lost:
$ hg tlog -p --git -r tip
2: 'rename A'
diff --git a/a b/a-renamed
rename from a
rename to a-renamed
$ cd ..
$ hg init b
$ cd b
$ echo a > a
$ hg ci -Am A
adding a
$ echo b > b
$ hg ci -Am B
adding b
$ hg up -q -C 0
$ hg cp a a-copied
$ hg ci -m 'copy A'
created new head
$ hg tglog
@ 2: 'copy A'
|
| o 1: 'B'
|/
o 0: 'A'
Copy is tracked:
$ hg tlog -p --git -r tip
2: 'copy A'
diff --git a/a b/a-copied
copy from a
copy to a-copied
Rebase the revision containing the copy:
$ hg rebase -s 2 -d 1
saved backup bundle to $TESTTMP/b/.hg/strip-backup/*-backup.hg (glob)
$ hg tglog
@ 2: 'copy A'
|
o 1: 'B'
|
o 0: 'A'
Copy is not lost:
$ hg tlog -p --git -r tip
2: 'copy A'
diff --git a/a b/a-copied
copy from a
copy to a-copied