# HG changeset patch
# User Simon Heimberg <[email protected]>
# Date 1245669566 -7200
# Node ID 44d7a44c74f5472838b44dfe0844963d7d201c48
# Parent 3e2e45402176eb061455179132ec2180bf464ed2
status/hgshelve: only set mq mode when working directory is qtip
it is possible to execute hg update when patches are applied
diff -r 3e2e45402176 -r 44d7a44c74f5 hggtk/hgshelve.py
--- a/hggtk/hgshelve.py Mon Jun 22 13:19:26 2009 +0200
+++ b/hggtk/hgshelve.py Mon Jun 22 13:19:26 2009 +0200
@@ -438,7 +438,7 @@
def shelvefunc(ui, repo, message, match, opts):
# If an MQ patch is applied, consider all qdiff changes
- if hasattr(repo, 'mq') and repo.mq.applied:
+ if hasattr(repo, 'mq') and repo.mq.applied and repo['.'] ==
repo['qtip']:
qtip = repo['.']
basenode = qtip.parents()[0].node()
else:
diff -r 3e2e45402176 -r 44d7a44c74f5 hggtk/status.py
--- a/hggtk/status.py Mon Jun 22 13:19:26 2009 +0200
+++ b/hggtk/status.py Mon Jun 22 13:19:26 2009 +0200
@@ -231,7 +231,7 @@
except KeyError:
pass
self.mqmode = None
- if hasattr(self.repo, 'mq') and self.repo.mq.applied:
+ if hasattr(self.repo, 'mq') and self.repo.mq.applied and repo['.'] ==
repo['qtip']:
self.mqmode = True
@@ -551,7 +551,7 @@
repo = self.repo
hglib.invalidaterepo(repo)
if hasattr(repo, 'mq'):
- self.mqmode = repo.mq.applied
+ self.mqmode = repo.mq.applied and repo['.'] == repo['qtip']
self.set_title(self.get_title())
if self.mqmode and self.mode != 'status':
------------------------------------------------------------------------------
Are you an open source citizen? Join us for the Open Source Bridge conference!
Portland, OR, June 17-19. Two days of sessions, one day of unconference: $250.
Need another reason to go? 24-hour hacker lounge. Register today!
http://ad.doubleclick.net/clk;215844324;13503038;v?http://opensourcebridge.org
_______________________________________________
Tortoisehg-develop mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
