locize-cli 10.0.3 → 10.1.1

package/CHANGELOG.md

@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [10.1.1](https://github.com/locize/locize-cli/compare/v10.1.0...v10.1.1) - 2025-07-12
+
+- create-branch: nicer feedback, if branch already exists
+
+## [10.1.0](https://github.com/locize/locize-cli/compare/v10.0.3...v10.1.0) - 2025-07-10
+
+- introduce branching features
+
 ## [10.0.3](https://github.com/locize/locize-cli/compare/v10.0.2...v10.0.3) - 2025-07-09
 
 - introduce `--ignore-if-version-exists` option for `copy-version`

package/README.md

@@ -325,6 +325,27 @@ locize format path/to/dictionary --format android
 ```
 
 
+## Working with branches
+### Create a new branch
+
+```sh
+locize create-branch featureXYZ --api-key my-api-key-d9de-4f55-9855-a9ef0ed44672 --project-id my-project-id-93e1-442a-ab35-24331fa294ba --ver latest
+```
+
+### Sync or Download that branch
+
+```sh
+locize sync --branch featureXYZ --api-key my-api-key-d9de-4f55-9855-a9ef0ed44672 --project-id my-project-id-93e1-442a-ab35-24331fa294ba
+
+locize download --branch featureXYZ --api-key my-api-key-d9de-4f55-9855-a9ef0ed44672 --project-id my-project-id-93e1-442a-ab35-24331fa294ba
+```
+
+### Merge that branch
+
+```sh
+locize merge-branch featureXYZ --api-key my-api-key-d9de-4f55-9855-a9ef0ed44672 --project-id my-project-id-93e1-442a-ab35-24331fa294ba --delete true
+```
+
 
 ## Other information
 

package/bin/locize

@@ -26,6 +26,8 @@ const removeVersion = require('../removeVersion.js');
 const publishVersion = require('../publishVersion');
 const deleteNamespace = require('../deleteNamespace');
 const formatFn = require('../format');
+const createBranch = require('../createBranch');
+const mergeBranch = require('../mergeBranch');
 
 var config = {};
 try {
@@ -239,6 +241,7 @@ program
   .option('-m, --path-mask <mask>', 'This will define the folder and file structure; do not add a file extension (default: {{language}}/{{namespace}})', `{{language}}${path.sep}{{namespace}}`)
   .option('-c, --clean <true|false>', 'Removes all local files by removing the whole folder (default: false)', 'false')
   .option('-up, --unpublished <true|false>', 'Downloads the current (unpublished) translations. This will generate private download costs (default: false)', 'false')
+  .option('-b, --branch <branch>', 'The branch name (or id) that should be targeted')
   .option('-C, --config-path <configPath>', `Specify the path to the optional locize config file (default: ${configInWorkingDirectory} or ${configInHome})`)
   .action((options) => {
     try {
@@ -275,6 +278,8 @@ program
 
     const pathMask = options.pathMask;
 
+    const branch = options.branch;
+
     download({
       apiKey: apiKey,
       projectId: projectId,
@@ -289,7 +294,8 @@ program
       clean: clean,
       languageFolderPrefix: languageFolderPrefix,
       pathMask: pathMask,
-      unpublished: unpublished
+      unpublished: unpublished,
+      branch: branch
     });
   })
   .on('--help', () => {
@@ -380,6 +386,7 @@ program
   .option('-n, --namespace <ns>', 'The namespace that should be targeted (you can also pass a comma separated list)')
   .option('-g, --get-path <url>', `Specify the get-path url that should be used (default: ${getPathUrl})`)
   .option('-up, --unpublished <true|false>', 'Downloads the current (unpublished) translations. This will generate private download costs (default: false)', 'false')
+  .option('-b, --branch <branch>', 'The branch name (or id) that should be targeted')
   .option('-C, --config-path <configPath>', `Specify the path to the optional locize config file (default: ${configInWorkingDirectory} or ${configInHome})`)
   .action((options) => {
     try {
@@ -428,6 +435,7 @@ program
     const unpublished = options.unpublished === 'true';
     const autoCreatePath = options.autoCreatePath === 'true';
     const backupDeletedPath = options.backupDeletedPath;
+    const branch = options.branch;
 
     sync({
       apiPath: url.parse(getPath).protocol + '//' + url.parse(getPath).host,
@@ -453,7 +461,8 @@ program
       pathMask: pathMask,
       unpublished: unpublished,
       autoCreatePath: autoCreatePath,
-      backupDeletedPath: backupDeletedPath
+      backupDeletedPath: backupDeletedPath,
+      branch: branch
     });
   })
   .on('--help', () => {
@@ -591,8 +600,8 @@ program
   .on('--help', () => {
     console.log('  Examples:');
     console.log();
-    console.log('    $ locize copy-version latest"');
-    console.log('    $ locize copy-version latest --ver production"');
+    console.log('    $ locize copy-version latest');
+    console.log('    $ locize copy-version latest --ver production');
     console.log('    $ locize copy-version latest --api-key <apiKey> --project-id <projectId> --ver <version>');
     console.log();
   });
@@ -635,7 +644,7 @@ program
   .on('--help', () => {
     console.log('  Examples:');
     console.log();
-    console.log('    $ locize remove-version tmp-ver"');
+    console.log('    $ locize remove-version tmp-ver');
     console.log('    $ locize remove-version tmp-ver --api-key <apiKey> --project-id <projectId>');
     console.log();
   });
@@ -685,8 +694,8 @@ program
   .on('--help', () => {
     console.log('  Examples:');
     console.log();
-    console.log('    $ locize publish-version"');
-    console.log('    $ locize publish-version --ver production"');
+    console.log('    $ locize publish-version');
+    console.log('    $ locize publish-version --ver production');
     console.log('    $ locize publish-version --api-key <apiKey> --project-id <projectId> --ver <version>');
     console.log();
   });
@@ -781,6 +790,100 @@ program
     console.log();
   });
 
+program
+  .command('create-branch <branch>')
+  .alias('cb')
+  .description('create branch')
+  .option('-k, --api-key <apiKey>', 'The api-key that should be used')
+  .option('-v, --ver <version>', 'The target version to be used to copy to (default: latest)')
+  .option('-i, --project-id <projectId>', 'The project-id that should be used')
+  .option('-C, --config-path <configPath>', `Specify the path to the optional locize config file (default: ${configInWorkingDirectory} or ${configInHome})`)
+  .action((branch, options) => {
+    try {
+      config = ini.parse(fs.readFileSync(options.configPath, 'utf-8')) || config;
+    } catch (e) {}
+
+    const apiKey = options.apiKey || config.apiKey || process.env.LOCIZE_API_KEY || process.env.LOCIZE_KEY;
+    if (!apiKey) {
+      console.error('  error: missing required argument `apiKey`');
+      process.exit(1);
+      return;
+    }
+
+    const projectId = options.projectId || config.projectId || process.env.LOCIZE_PROJECTID || process.env.LOCIZE_PID;
+    if (!projectId) {
+      console.error('  error: missing required argument `projectId`');
+      process.exit(1);
+      return;
+    }
+
+    const version = options.ver || config.ver || config.version || process.env.LOCIZE_VERSION || process.env.LOCIZE_VER || 'latest';
+
+    const getPath = options.getPath || config.getPath || options.addPath || config.addPath || getPathUrl;
+
+    createBranch({
+      apiKey: apiKey,
+      projectId: projectId,
+      apiPath: url.parse(getPath).protocol + '//' + url.parse(getPath).host,
+      version: version,
+      branch: branch
+    });
+  })
+  .on('--help', () => {
+    console.log('  Examples:');
+    console.log();
+    console.log('    $ locize creaete-branch featureX');
+    console.log('    $ locize creaete-branch featureX --ver production');
+    console.log('    $ locize creaete-branch featureX --api-key <apiKey> --project-id <projectId> --ver <version>');
+    console.log();
+  });
+
+program
+  .command('merge-branch <branch>')
+  .alias('mb')
+  .description('merge branch')
+  .option('-k, --api-key <apiKey>', 'The api-key that should be used')
+  .option('-i, --project-id <projectId>', 'The project-id that should be used')
+  .option('-d, --delete <true|false>', 'This will delete the branch after merging. (default: false)', 'false')
+  .option('-C, --config-path <configPath>', `Specify the path to the optional locize config file (default: ${configInWorkingDirectory} or ${configInHome})`)
+  .action((branch, options) => {
+    try {
+      config = ini.parse(fs.readFileSync(options.configPath, 'utf-8')) || config;
+    } catch (e) {}
+
+    const apiKey = options.apiKey || config.apiKey || process.env.LOCIZE_API_KEY || process.env.LOCIZE_KEY;
+    if (!apiKey) {
+      console.error('  error: missing required argument `apiKey`');
+      process.exit(1);
+      return;
+    }
+
+    const projectId = options.projectId || config.projectId || process.env.LOCIZE_PROJECTID || process.env.LOCIZE_PID;
+    if (!projectId) {
+      console.error('  error: missing required argument `projectId`');
+      process.exit(1);
+      return;
+    }
+
+    const getPath = options.getPath || config.getPath || options.addPath || config.addPath || getPathUrl;
+
+    mergeBranch({
+      apiKey: apiKey,
+      projectId: projectId,
+      apiPath: url.parse(getPath).protocol + '//' + url.parse(getPath).host,
+      delete: options.delete === 'true',
+      branch: branch
+    });
+  })
+  .on('--help', () => {
+    console.log('  Examples:');
+    console.log();
+    console.log('    $ locize merge-branch featureX');
+    console.log('    $ locize merge-branch <projectId-of-branch>');
+    console.log('    $ locize merge-branch featureX --delete true');
+    console.log('    $ locize merge-branch featureX --api-key <apiKey> --project-id <projectId> --delete true');
+    console.log();
+  });
 
 program.parse(process.argv);
 

package/createBranch.js

@@ -0,0 +1,61 @@
+const colors = require('colors');
+const request = require('./request');
+const getBranches = require('./getBranches');
+
+const handleError = (err, cb) => {
+  if (!cb && err) {
+    console.error(colors.red(err.stack));
+    process.exit(1);
+  }
+  if (cb) cb(err);
+};
+
+const createBranch = (opt, cb) => {
+  getBranches(opt, (err, branches) => {
+    if (err) return handleError(err, cb);
+
+    const b = branches.find((br) => br.name === opt.branch);
+    if (b) {
+      if (!cb) console.log(colors.green('creating branch "' + b.name + '" (' + b.id + ') not necessary, because already existing'));
+      if (cb) cb(null, b);
+      return;
+    }
+
+    request(opt.apiPath + '/branch/create/' + opt.projectId + '/' + opt.version, {
+      method: 'post',
+      headers: {
+        'Authorization': opt.apiKey
+      },
+      body: { name: opt.branch }
+    }, (err, res, obj) => {
+      if (err || (obj && (obj.errorMessage || obj.message))) {
+        if (!cb) console.log(colors.red('creating branch failed...'));
+
+        if (err) {
+          if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
+          if (cb) cb(err);
+          return;
+        }
+        if (obj && (obj.errorMessage || obj.message)) {
+          if (!cb) { console.error(colors.red((obj.errorMessage || obj.message))); process.exit(1); }
+          if (cb) cb(new Error((obj.errorMessage || obj.message)));
+          return;
+        }
+      }
+      if (res.status === 404) {
+        if (!cb) { console.error(colors.yellow(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+        if (cb) cb(null, null);
+        return;
+      }
+      if (res.status >= 300) {
+        if (!cb) { console.error(colors.red(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+        if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
+        return;
+      }
+      if (!cb) console.log(colors.green('creating branch "' + obj.name + '" (' + obj.id + ') successful'));
+      if (cb) cb(null, obj);
+    });
+  });
+};
+
+module.exports = createBranch;

package/download.js

@@ -13,6 +13,8 @@ const formats = require('./formats');
 const getProjectStats = require('./getProjectStats');
 const reversedFileExtensionsMap = formats.reversedFileExtensionsMap;
 const locize2xcstrings = require('locize-xcstrings/cjs/locize2xcstrings');
+const getBranches = require('./getBranches');
+const isValidUuid = require('./isValidUuid');
 
 function getInfosInUrl(download) {
   const splitted = download.key.split('/');
@@ -370,25 +372,7 @@ const filterDownloads = (opt, downloads) => {
   return filterDownloadsLanguages(opt, downloads);
 };
 
-const download = (opt, cb) => {
-  opt.format = opt.format || 'json';
-  if (!reversedFileExtensionsMap[opt.format]) {
-    return handleError(new Error(`${opt.format} is not a valid format!`), cb);
-  }
-
-  if (opt.skipEmpty === undefined) opt.skipEmpty = true;
-  opt.apiPath = opt.apiPath || 'https://api.locize.app';
-  opt.version = opt.version || 'latest';
-  opt.languageFolderPrefix = opt.languageFolderPrefix || '';
-  opt.path = opt.path || opt.target;
-  opt.pathMaskInterpolationPrefix = opt.pathMaskInterpolationPrefix || '{{';
-  opt.pathMaskInterpolationSuffix = opt.pathMaskInterpolationSuffix || '}}';
-  opt.pathMask = opt.pathMask || `${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}${path.sep}${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`;
-  opt.pathMask = opt.pathMask.replace(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`, `${opt.languageFolderPrefix}${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`);
-  if (opt.unpublished && !opt.apiKey) {
-    return handleError(new Error('Please provide also an api-key!'), cb);
-  }
-
+const continueToDownload = (opt, cb) => {
   var url = opt.apiPath + '/download/' + opt.projectId;
 
   if (opt.namespace && opt.namespace.indexOf(',') > 0 && opt.namespace.indexOf(' ') < 0) {
@@ -468,4 +452,44 @@ const download = (opt, cb) => {
   });
 };
 
+const download = (opt, cb) => {
+  opt.format = opt.format || 'json';
+  if (!reversedFileExtensionsMap[opt.format]) {
+    return handleError(new Error(`${opt.format} is not a valid format!`), cb);
+  }
+
+  if (opt.skipEmpty === undefined) opt.skipEmpty = true;
+  opt.apiPath = opt.apiPath || 'https://api.locize.app';
+  opt.version = opt.version || 'latest';
+  opt.languageFolderPrefix = opt.languageFolderPrefix || '';
+  opt.path = opt.path || opt.target;
+  opt.pathMaskInterpolationPrefix = opt.pathMaskInterpolationPrefix || '{{';
+  opt.pathMaskInterpolationSuffix = opt.pathMaskInterpolationSuffix || '}}';
+  opt.pathMask = opt.pathMask || `${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}${path.sep}${opt.pathMaskInterpolationPrefix}namespace${opt.pathMaskInterpolationSuffix}`;
+  opt.pathMask = opt.pathMask.replace(`${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`, `${opt.languageFolderPrefix}${opt.pathMaskInterpolationPrefix}language${opt.pathMaskInterpolationSuffix}`);
+  if (opt.unpublished && !opt.apiKey) {
+    return handleError(new Error('Please provide also an api-key!'), cb);
+  }
+
+  if (opt.branch) {
+    getBranches(opt, (err, branches) => {
+      if (err) return handleError(err, cb);
+
+      let b;
+      if (isValidUuid(opt.branch)) b = branches.find((br) => br.id === opt.branch);
+      if (!b) b = branches.find((br) => br.name === opt.branch);
+      if (!b) {
+        return handleError(new Error(`Branch ${opt.branch} not found!`), cb);
+      }
+      opt.projectId = b.id;
+      opt.version = b.version;
+
+      continueToDownload(opt, cb);
+    });
+    return;
+  }
+
+  continueToDownload(opt, cb);
+};
+
 module.exports = download;

package/getBranches.js

@@ -0,0 +1,40 @@
+const colors = require('colors');
+const request = require('./request');
+
+const getBranches = (opt, cb) => {
+  request(opt.apiPath + '/branches/' + opt.projectId, {
+    method: 'get',
+    headers: {
+      'Authorization': opt.apiKey
+    }
+  }, (err, res, obj) => {
+    if (err || (obj && (obj.errorMessage || obj.message))) {
+      if (!cb) console.log(colors.red('getting branches failed...'));
+
+      if (err) {
+        if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
+        if (cb) cb(err);
+        return;
+      }
+      if (obj && (obj.errorMessage || obj.message)) {
+        if (!cb) { console.error(colors.red((obj.errorMessage || obj.message))); process.exit(1); }
+        if (cb) cb(new Error((obj.errorMessage || obj.message)));
+        return;
+      }
+    }
+    if (res.status === 404) {
+      if (!cb) { console.error(colors.yellow(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+      if (cb) cb(null, null);
+      return;
+    }
+    if (res.status >= 300) {
+      if (!cb) { console.error(colors.red(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+      if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
+      return;
+    }
+    if (!cb) console.log(colors.green('getting branches successful'));
+    if (cb) cb(null, obj);
+  });
+};
+
+module.exports = getBranches;

package/getJob.js

@@ -32,7 +32,7 @@ const getJob = (opt, jobId, cb) => {
       if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
       return;
     }
-    if (!cb) console.log(colors.green('getting job succesfull'));
+    if (!cb) console.log(colors.green('getting job successful'));
     if (cb) cb(null, obj);
   });
 };

package/getProjectStats.js

@@ -32,7 +32,7 @@ const getProjectStats = (opt, cb) => {
       if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
       return;
     }
-    if (!cb) console.log(colors.green('getting project stats succesfull'));
+    if (!cb) console.log(colors.green('getting project stats successful'));
     if (cb) cb(null, obj);
   });
 };

package/isValidUuid.js

@@ -0,0 +1,2 @@
+const uuidRegex = /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i;
+module.exports = (id) => uuidRegex.test(id);

package/mergeBranch.js

@@ -0,0 +1,98 @@
+const colors = require('colors');
+const request = require('./request');
+const getBranches = require('./getBranches');
+const isValidUuid = require('./isValidUuid');
+const getJob = require('./getJob');
+
+const mergeBranch = (opt, cb) => {
+  const queryParams = new URLSearchParams();
+  if (opt.delete) {
+    queryParams.append('delete', 'true');
+  }
+  const queryString = queryParams.size > 0 ? '?' + queryParams.toString() : '';
+  request(opt.apiPath + '/branch/merge/' + opt.branch + queryString, {
+    method: 'post',
+    headers: {
+      'Authorization': opt.apiKey
+    }
+  }, (err, res, obj) => {
+    if (err || (obj && (obj.errorMessage || obj.message))) {
+      if (!cb) console.log(colors.red('merging branch failed...'));
+
+      if (err) {
+        if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
+        if (cb) cb(err);
+        return;
+      }
+      if (obj && (obj.errorMessage || obj.message)) {
+        if (!cb) { console.error(colors.red((obj.errorMessage || obj.message))); process.exit(1); }
+        if (cb) cb(new Error((obj.errorMessage || obj.message)));
+        return;
+      }
+    }
+    if (res.status === 404) {
+      if (!cb) { console.error(colors.yellow(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+      if (cb) cb(null, null);
+      return;
+    }
+    if (res.status >= 300) {
+      if (!cb) { console.error(colors.red(res.statusText + ' (' + res.status + ')')); process.exit(1); }
+      if (cb) cb(new Error(res.statusText + ' (' + res.status + ')'));
+      return;
+    }
+
+    if (!obj || !obj.jobId) {
+      if (!cb) { console.error(colors.red('No jobId! Something went wrong!')); process.exit(1); }
+      if (cb) cb(new Error('No jobId! Something went wrong!'));
+      return;
+    }
+
+    (function waitForJob() {
+      getJob(opt, obj.jobId, (err, job) => {
+        if (err) {
+          if (!cb) { console.error(colors.red(err.message)); process.exit(1); }
+          if (cb) cb(err);
+          return;
+        }
+
+        if (job && !job.timeouted) {
+          setTimeout(waitForJob, 2000);
+          return;
+        }
+
+        if (job && job.timeouted) {
+          if (!cb) { console.error(colors.red('Job timeouted!')); process.exit(1); }
+          if (cb) cb(new Error('Job timeouted!'));
+          return;
+        }
+
+        if (!cb) console.log(colors.green('merging branch successful'));
+        if (cb) cb(null);
+      });
+    })();
+  });
+};
+
+const handleError = (err, cb) => {
+  if (!cb && err) {
+    console.error(colors.red(err.stack));
+    process.exit(1);
+  }
+  if (cb) cb(err);
+};
+
+module.exports = (opt, cb) => {
+  getBranches(opt, (err, branches) => {
+    if (err) return handleError(err, cb);
+
+    let b;
+    if (isValidUuid(opt.branch)) b = branches.find((br) => br.id === opt.branch);
+    if (!b) b = branches.find((br) => br.name === opt.branch);
+    if (!b) {
+      return handleError(new Error(`Branch ${opt.branch} not found!`), cb);
+    }
+    opt.branch = b.id;
+
+    mergeBranch(opt, cb);
+  });
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "locize-cli",
-  "version": "10.0.3",
+  "version": "10.1.1",
   "description": "locize cli to import locales",
   "main": "index.js",
   "bin": {

package/sync.js

@@ -18,6 +18,8 @@ const deleteNamespace = require('./deleteNamespace');
 const getProjectStats = require('./getProjectStats');
 const reversedFileExtensionsMap = formats.reversedFileExtensionsMap;
 const locize2xcstrings = require('locize-xcstrings/cjs/locize2xcstrings');
+const getBranches = require('./getBranches');
+const isValidUuid = require('./isValidUuid');
 
 const getDirectories = (srcpath) => {
   return fs.readdirSync(srcpath).filter((file) => {
@@ -659,6 +661,49 @@ const handleSync = (opt, remoteLanguages, localNamespaces, cb) => {
   });
 };
 
+const continueToSync = (opt, cb) => {
+  console.log(colors.grey('checking remote (locize)...'));
+  getRemoteLanguages(opt, (err, remoteLanguages) => {
+    if (err) return handleError(err, cb);
+
+    if (opt.referenceLanguageOnly && opt.language && opt.referenceLanguage !== opt.language) {
+      opt.referenceLanguage = opt.language;
+    }
+    if (opt.referenceLanguageOnly && !opt.language && opt.languages && opt.languages.length > 0 && opt.languages.indexOf(opt.referenceLanguage) < 0) {
+      opt.referenceLanguage = opt.languages[0];
+    }
+
+    if (opt.referenceLanguageOnly) {
+      console.log(colors.grey(`checking local${opt.path !== process.cwd() ? ` (${opt.path})` : ''} only reference language...`));
+      parseLocalReference(opt, (err, localNamespaces) => {
+        if (err) return handleError(err, cb);
+
+        if (!opt.dry && opt.cleanLocalFiles) {
+          localNamespaces.forEach((ln) => fs.unlinkSync(ln.path));
+          localNamespaces = [];
+        }
+
+        console.log(colors.grey('calculate diffs...'));
+        handleSync(opt, remoteLanguages, localNamespaces, cb);
+      });
+      return;
+    }
+
+    console.log(colors.grey(`checking local${opt.path !== process.cwd() ? ` (${opt.path})` : ''}...`));
+    parseLocalLanguages(opt, remoteLanguages, (err, localNamespaces) => {
+      if (err) return handleError(err, cb);
+
+      if (!opt.dry && opt.cleanLocalFiles) {
+        localNamespaces.forEach((ln) => fs.unlinkSync(ln.path));
+        localNamespaces = [];
+      }
+
+      console.log(colors.grey('calculate diffs...'));
+      handleSync(opt, remoteLanguages, localNamespaces, cb);
+    });
+  });
+};
+
 const sync = (opt, cb) => {
   opt.format = opt.format || 'json';
   if (!reversedFileExtensionsMap[opt.format]) {
@@ -695,46 +740,25 @@ const sync = (opt, cb) => {
     return handleError(new Error('Please provide also an api-key!'), cb);
   }
 
-  console.log(colors.grey('checking remote (locize)...'));
-  getRemoteLanguages(opt, (err, remoteLanguages) => {
-    if (err) return handleError(err, cb);
-
-    if (opt.referenceLanguageOnly && opt.language && opt.referenceLanguage !== opt.language) {
-      opt.referenceLanguage = opt.language;
-    }
-    if (opt.referenceLanguageOnly && !opt.language && opt.languages && opt.languages.length > 0 && opt.languages.indexOf(opt.referenceLanguage) < 0) {
-      opt.referenceLanguage = opt.languages[0];
-    }
-
-    if (opt.referenceLanguageOnly) {
-      console.log(colors.grey(`checking local${opt.path !== process.cwd() ? ` (${opt.path})` : ''} only reference language...`));
-      parseLocalReference(opt, (err, localNamespaces) => {
-        if (err) return handleError(err, cb);
-
-        if (!opt.dry && opt.cleanLocalFiles) {
-          localNamespaces.forEach((ln) => fs.unlinkSync(ln.path));
-          localNamespaces = [];
-        }
-
-        console.log(colors.grey('calculate diffs...'));
-        handleSync(opt, remoteLanguages, localNamespaces, cb);
-      });
-      return;
-    }
-
-    console.log(colors.grey(`checking local${opt.path !== process.cwd() ? ` (${opt.path})` : ''}...`));
-    parseLocalLanguages(opt, remoteLanguages, (err, localNamespaces) => {
+  if (opt.branch) {
+    getBranches(opt, (err, branches) => {
       if (err) return handleError(err, cb);
 
-      if (!opt.dry && opt.cleanLocalFiles) {
-        localNamespaces.forEach((ln) => fs.unlinkSync(ln.path));
-        localNamespaces = [];
+      let b;
+      if (isValidUuid(opt.branch)) b = branches.find((br) => br.id === opt.branch);
+      if (!b) b = branches.find((br) => br.name === opt.branch);
+      if (!b) {
+        return handleError(new Error(`Branch ${opt.branch} not found!`), cb);
       }
+      opt.projectId = b.id;
+      opt.version = b.version;
 
-      console.log(colors.grey('calculate diffs...'));
-      handleSync(opt, remoteLanguages, localNamespaces, cb);
+      continueToSync(opt, cb);
     });
-  });
+    return;
+  }
+
+  continueToSync(opt, cb);
 };
 
 module.exports = sync;