equal
deleted
inserted
replaced
1202 keepchanges=False): |
1202 keepchanges=False): |
1203 self.checkkeepchanges(keepchanges, force) |
1203 self.checkkeepchanges(keepchanges, force) |
1204 diffopts = self.diffopts() |
1204 diffopts = self.diffopts() |
1205 wlock = repo.wlock() |
1205 wlock = repo.wlock() |
1206 try: |
1206 try: |
1207 heads = [h for hs in repo.branchmap().itervalues() for h in hs] |
1207 heads = [] |
|
1208 for hs in repo.branchmap().itervalues(): |
|
1209 heads.extend(hs) |
1208 if not heads: |
1210 if not heads: |
1209 heads = [nullid] |
1211 heads = [nullid] |
1210 if repo.dirstate.p1() not in heads and not exact: |
1212 if repo.dirstate.p1() not in heads and not exact: |
1211 self.ui.status(_("(working directory not at a head)\n")) |
1213 self.ui.status(_("(working directory not at a head)\n")) |
1212 |
1214 |