newt: Don't stop upgrade when some repos are in dirty state

Now if force flag is not set, only repos in dirty state will
not get upgraded. The rest of the repos will be upgraded.

newt/install/install.go

@@ -342,7 +342,7 @@ func (inst *Installer) installPrompt(vm deprepo.VersionMap, op installOp,
 	}
 
 	util.StatusMessage(util.VERBOSITY_DEFAULT,
-		"Making the following changes to the project:\n")
+		"Trying to make the following changes to the project:\n")
 
 	names := vm.SortedNames()
 	for _, name := range names {
@@ -554,10 +554,6 @@ func verifyNewtCompat(repos []*repo.Repo, vm deprepo.VersionMap) error {
 func (inst *Installer) Upgrade(candidates []*repo.Repo, force bool,
 	ask bool) error {
 
-	if err := verifyRepoDirtyState(candidates, force); err != nil {
-		return err
-	}
-
 	vm, err := inst.calcVersionMap(candidates)
 	if err != nil {
 		return err
@@ -591,6 +587,22 @@ func (inst *Installer) Upgrade(candidates []*repo.Repo, force bool,
 	// Upgrade each repo in the version map.
 	for _, r := range repos {
 		destVer := vm[r.Name()]
+		dirtyState, err := r.DirtyState()
+		if err != nil {
+			return err
+		}
+
+		if dirtyState != "" {
+			if !force {
+				util.StatusMessage(util.VERBOSITY_DEFAULT,
+					"%s is in dirty state, it won't be upgraded\n",
+					r.Name())
+				continue
+			} else {
+				util.OneTimeWarning("forced update of repo in dirty state: %s", r.Name())
+			}
+		}
+
 		if err := r.Upgrade(destVer); err != nil {
 			return err
 		}