Mercurial > hg > easyhg

changeset 137:a4044b4b3e35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Include closed branches in heads check (see comment)
author Chris Cannam
date Tue, 30 Nov 2010 13:51:27 +0000
parents d66fcf2e0342
children a7dbc8e5b69d
files mainwindow.cpp
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mainwindow.cpp	Tue Nov 30 13:50:58 2010 +0000
+++ b/mainwindow.cpp	Tue Nov 30 13:51:27 2010 +0000
@@ -178,8 +178,12 @@
 void MainWindow::hgQueryHeads()
 {
     QStringList params;
-    params << "heads";
-    // on empty repos, "hg heads" will fail -- we don't care about that.
+    // On empty repos, "hg heads" will fail -- we don't care about
+    // that.  Use --closed option so as to include closed branches;
+    // otherwise we'll be stuck if the user updates into one, and our
+    // incremental log will end up with spurious stuff in it because
+    // we won't be pruning at the ends of closed branches
+    params << "heads" << "--closed";
     runner->requestAction(HgAction(ACT_QUERY_HEADS, workFolderPath, params));
 }