Siddharth Agarwal <sid0@fb.com> [Tue, 19 Nov 2013 12:42:17 -0800] rev 20234
commands.bookmarks: move cur initialization to inside wlock
This is more correct because we now fetch '.' while nothing else can interfere
with it.
Siddharth Agarwal <sid0@fb.com> [Thu, 21 Nov 2013 17:11:04 -0800] rev 20233
commands.bookmarks: pass cur in explicitly to checkconflict
cur will be moved inside the wlock in a future patch, so we need to pass it
into checkconflict explicitly.
Siddharth Agarwal <sid0@fb.com> [Tue, 19 Nov 2013 12:33:14 -0800] rev 20232
commands.bookmarks: hold wlock for write operations
Any invocations of bookmarks other than a plain 'hg bookmarks' will likely
cause a write to the bookmark store. These should be guarded by the wlock.
The repo._bookmarks read should be similarly guarded by the wlock if we're
going to be subsequently writing to it.
Siddharth Agarwal <sid0@fb.com> [Tue, 19 Nov 2013 11:47:30 -0800] rev 20231
commands.bookmarks: separate out 'no bookmarks set' status messages
Upcoming patches will acquire the wlock for write operations, such as make
inactive, but not read-only ones, such as list bookmarks. Separate out the
status messages so that the code paths can be separated.
Mads Kiilerich <madski@unity3d.com> [Sat, 16 Nov 2013 19:56:53 -0500] rev 20230
tests: test-convert-cvs-synthetic.t requires cvs 1.12
9589227657bc introduced hghave cvs112 10 months ago. Let's assume it has
stabilized so much that we can start using it now.
Matt Mackall <mpm@selenic.com> [Mon, 13 Jan 2014 14:33:39 -0600] rev 20229
merge with stable
David Soria Parra <davidsp@fb.com> [Wed, 08 Jan 2014 12:25:00 -0800] rev 20228
i18n-de: rename noun "entfernt" to "Gegenseite"
The German translation for "remote" as "entfernt" can be misleading
in situations where remote is used as a noun. "entfernt" is not a
noun and can also mean "removed". To clarify this we rename "remote"
to "Gegenseite" when used as a noun.