Mercurial > hg > hq

comparison hq/main.py @ 21:aad5083f1117

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
foo
author Jeff Hammel <jhammel@mozilla.com>
date Thu, 11 Jul 2013 10:53:03 -0700
parents bc17ab3c516e
children 7fd599dbef51
comparison
equal deleted inserted replaced
20:bc17ab3c516e 21:aad5083f1117
93 self._call('qpop', '--all') 93 self._call('qpop', '--all')
94 self._call(*(['pull'] + (repo and [repo] or []))) 94 self._call(*(['pull'] + (repo and [repo] or [])))
95 # TODO: pull queue repo 95 # TODO: pull queue repo
96 if self._versioned(): 96 if self._versioned():
97 if self.incoming(): 97 if self.incoming():
98 print >> sys.stderr, "Incoming changes, cannot pull" 98 print >> sys.stderr, "Incoming changes"
99 # TODO: yes you can if they're compatible 99
100 output = self._status(self.directory())
101 if output:
102 print >> sys.stderr, "Cannot pull %s; outstanding changes" % (self.directory())
103 print output
100 else: 104 else:
101 output = self._status(self.directory()) 105 self._call('pull', '--mq')
102 if output:
103 print >> sys.stderr, "Cannot pull %s; outstanding changes" % (self.directory())
104 print output
105 else:
106 self._call('pull', '--mq')
107 for patch in applied: 106 for patch in applied:
108 self._call('qpush') 107 self._call('qpush')
109 108
110 def goto(self, patch): 109 def goto(self, patch):
111 """ 110 """