Patrick Mezard <pmezard@gmail.com> [Thu, 02 Feb 2012 10:15:12 +0100] rev 16060
convert/bzr: convert all branches (issue3229) (BC)
Instead of opening the target bzr checkout as a single branch, we try to open
it as a repository. This has the following effects:
- All branches are now converted
- bzr branch names are preserved. Previously, the selected branch was always
converted as 'default'. Branches without a name or 'trunk' are mapped to
'default branch.
- Lightweight checkouts are no longer supported. Maybe they can be, I did not
try to fix that at all.
Implementation notes:
- This was a quick fix, I have no knowledge of bzr API besides browsing 2.0.3
sources.
- The fix was only tested on OSX against bzr 2.4.2.
- Tags discovery does not handle collisions. I have no idea how tags work in
bzr so maybe such collisions are not possible.
Patrick Mezard <pmezard@gmail.com> [Thu, 02 Feb 2012 10:15:04 +0100] rev 16059
convert/bzr: expect unicode metadata, encode in UTF-8 (issue3232)
Before this patch, metadata and file names were interpreted like:
- unicode objects were converted to UTF-8
- non unicode objects were left unchanged
Looking at the code and bzr being known for transcoding filenames, we expect
everything to be returned as unicode objects, and we want to encode them in
UTF-8, like the subversion source does. To do that, we just remove the custom
implementation of .recode().
Patrick Mezard <pmezard@gmail.com> [Fri, 03 Feb 2012 19:23:13 +0100] rev 16058
test-mq: fix sed call on OSX
- The regular sed on OSX wants: -i "" not -i""
- GNU sed wants: -i"" not -i ""
Backups are fine.
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Mon, 30 Jan 2012 00:05:28 +0100] rev 16057
mq: rename secretcommit to newcommit
This function create secret changeset only when mq.secret is true
Matt Mackall <mpm@selenic.com> [Wed, 01 Feb 2012 16:28:35 -0600] rev 16056
merge with stable
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 21 Jan 2012 15:17:39 +0200] rev 16055
i18n-de: update po and remove fuzzies
Fabian Kreutz <fabian.kreutz@qvantel.com> [Sat, 21 Jan 2012 13:49:46 +0200] rev 16054
i18n-de: Rework and fixes continued
Matt Mackall <mpm@selenic.com> [Wed, 01 Feb 2012 14:23:58 -0600] rev 16053
Added signature for changeset 2aa5b51f310f
Matt Mackall <mpm@selenic.com> [Wed, 01 Feb 2012 14:23:55 -0600] rev 16052
Added tag 2.1 for changeset 2aa5b51f310f
Matt Mackall <mpm@selenic.com> [Wed, 01 Feb 2012 14:17:26 -0600] rev 16051
phases: don't complain if cset is already public on pushkey (issue3230)
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 01 Feb 2012 17:59:51 -0200] rev 16050
i18n-pt_BR: synchronized with 140b6282ac79
Matt Mackall <mpm@selenic.com> [Wed, 01 Feb 2012 13:50:45 -0600] rev 16049
merge with i18n
Pierre-Yves David <pierre-yves.david@logilab.fr> [Wed, 01 Feb 2012 12:20:10 +0100] rev 16048
mq: prevent rewriting operation on public changeset
The following operation are denied if the mq changeset is public
* qrefresh
* qpop
* qfold
note: qimport was already denied.
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 31 Jan 2012 18:11:08 -0200] rev 16047
i18n-pt_BR: miscellaneous spelling and wording fixes
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Tue, 31 Jan 2012 19:44:09 +0900] rev 16046
i18n-ja: synchronized with 0f99e709ce08
Alexander Sauta <demosito@gmail.com> [Tue, 31 Jan 2012 12:30:54 +0400] rev 16045
i18n-ru: synchronized with c0b2986b37b8; public phase name changed
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 30 Jan 2012 20:17:59 -0200] rev 16044
i18n-pt_BR: synchronized with c0b2986b37b8
Matt Mackall <mpm@selenic.com> [Tue, 31 Jan 2012 23:13:04 -0600] rev 16043
qpush: avoid trying to manage existing history (issue2218)
Matt Mackall <mpm@selenic.com> [Tue, 31 Jan 2012 17:25:37 -0600] rev 16042
bundlerepo: try to find containing repo on creation (issue1812)
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 16:37:15 -0600] rev 16041
phases: add resync example to help topic
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 16:04:14 -0600] rev 16040
mq: fix secret description in help
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 16:01:54 -0600] rev 16039
pull: return 1 when no changes found (BC)
Currently we have the following return codes if nothing is found:
commit incoming outgoing pull push
intended 1 1 1 1 1
documented 1 1 1 0 1
actual 1 1 1 0 1
This makes pull agree with the rest of the table and makes it easy to
detect "nothing was pulled" in scripts.
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 15:56:35 -0600] rev 16038
push: don't treat bookmark as a found change
Treating bookmarks as a found change results in confusing
documentation or output and is less useful for scripting.
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 14:44:01 -0600] rev 16037
glossary: add phase terms
Matt Mackall <mpm@selenic.com> [Mon, 30 Jan 2012 14:14:18 -0600] rev 16036
merge with i18n
Jens Bäckman <jens.backman@gmail.com> [Mon, 30 Jan 2012 16:28:27 +0100] rev 16035
i18n-sv: snchronized with ed9f40bc346f
Alexander Sauta <demosito@gmail.com> [Mon, 30 Jan 2012 13:04:13 +0400] rev 16034
i18n-ru: phases help translated
Alexander Sauta <demosito@gmail.com> [Mon, 30 Jan 2012 11:52:38 +0400] rev 16033
i18n-ru: minor corrections on unclear strings
Andrei Polushin <polushin@gmail.com> [Mon, 30 Jan 2012 02:48:03 +0700] rev 16032
i18n-ru: synchronized with 2605fc990725
Andrei Polushin <polushin@gmail.com> [Mon, 30 Jan 2012 02:07:04 +0700] rev 16031
i18n-ru: verifying uncertain translations.
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 17:46:15 +0100] rev 16030
phases: allow phase name in phases.new-commit settings
Before this commit only phase index where accepted
Pierre-Yves David <pierre-yves.david@logilab.fr> [Mon, 30 Jan 2012 15:17:08 +0100] rev 16029
qfinish: do not set secret changeset to draft if mq.secret=false
If mq.secret=false, mq should not touch phase