summaryrefslogtreecommitdiff
path: root/src/cmd/hgpatch/main.go
diff options
context:
space:
mode:
Diffstat (limited to 'src/cmd/hgpatch/main.go')
-rw-r--r--src/cmd/hgpatch/main.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/cmd/hgpatch/main.go b/src/cmd/hgpatch/main.go
index 3d18971cf..89aebda55 100644
--- a/src/cmd/hgpatch/main.go
+++ b/src/cmd/hgpatch/main.go
@@ -62,20 +62,20 @@ func main() {
// Make sure we won't be editing files with local pending changes.
dirtylist, err := hgModified()
chk(err)
- dirty := make(map[string]int)
+ dirty := make(map[string]bool)
for _, f := range dirtylist {
- dirty[f] = 1
+ dirty[f] = true
}
- conflict := make(map[string]int)
+ conflict := make(map[string]bool)
for _, f := range pset.File {
if f.Verb == patch.Delete || f.Verb == patch.Rename {
- if _, ok := dirty[f.Src]; ok {
- conflict[f.Src] = 1
+ if dirty[f.Src] {
+ conflict[f.Src] = true
}
}
if f.Verb != patch.Delete {
- if _, ok := dirty[f.Dst]; ok {
- conflict[f.Dst] = 1
+ if dirty[f.Dst] {
+ conflict[f.Dst] = true
}
}
}