The unified diff between revisions [d57ff5f2..] and [7c8eae2e..] is displayed below. It can also be downloaded as a raw diff.
This diff has been restricted to the following files: 'cmd_ws_commit.cc'
#
#
# patch "cmd_ws_commit.cc"
# from [201c71b8a02f01f3f08ee18b55523e8e59f2b9a1]
# to [f45192e24f0bcba0176136388df7b9ca1d273537]
#
============================================================
--- cmd_ws_commit.cc 201c71b8a02f01f3f08ee18b55523e8e59f2b9a1
+++ cmd_ws_commit.cc f45192e24f0bcba0176136388df7b9ca1d273537
@@ -18,6 +18,7 @@
#include "revision.hh"
#include "transforms.hh"
#include "work.hh"
+#include "hash_map.hh"
using std::cout;
using std::make_pair;
@@ -29,6 +30,8 @@ using boost::shared_ptr;
using boost::shared_ptr;
+using hashmap::hash_set;
+
static void
get_log_message_interactively(revision_t const & cs,
app_state & app,
@@ -424,14 +427,14 @@ CMD(checkout, N_("tree"), N_("[DIRECTORY
N(!app.branch_name().empty(),
F("use --revision or --branch to specify what to checkout"));
- set<revision_id> heads;
+ hash_set<revision_id> heads;
get_branch_heads(app.branch_name(), app, heads);
N(heads.size() > 0,
F("branch '%s' is empty") % app.branch_name);
if (heads.size() > 1)
{
P(F("branch %s has multiple heads:") % app.branch_name);
- for (set<revision_id>::const_iterator i = heads.begin(); i != heads.end(); ++i)
+ for (hash_set<revision_id>::const_iterator i = heads.begin(); i != heads.end(); ++i)
P(i18n_format(" %s") % describe_revision(app, *i));
P(F("choose one with '%s checkout -r<id>'") % ui.prog_name);
E(false, F("branch %s has multiple heads") % app.branch_name);
@@ -680,7 +683,7 @@ CMD(commit, N_("workspace"), N_("[PATH].
cert_value branchname;
I(restricted_rev.edges.size() == 1);
- set<revision_id> heads;
+ hash_set<revision_id> heads;
get_branch_heads(app.branch_name(), app, heads);
unsigned int old_head_size = heads.size();